Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reorganize some code to have 2D things grouped together #66744

Merged
merged 1 commit into from
Apr 13, 2024
Merged

Reorganize some code to have 2D things grouped together #66744

merged 1 commit into from
Apr 13, 2024

Conversation

aaronfranke
Copy link
Member

@aaronfranke aaronfranke commented Oct 2, 2022 •
edited
Loading

This PR takes pieces out of #47054, in the same vain as how #51474 took pieces out of #50147.

  • In CanvasItemEditorPlugin, move skeleton_menu declaration next to the rest of the skeleton code.
  • In CanvasItemEditorPlugin, put Control-derived options before Node2D-derived ones.
  • In SpriteFramesEditorPlugin, move the checks right after the casts they're using.
  • In World2D, move get_direct_space_state method up.
  • In register_scene_types.cpp, organize the 2D includes, organize 2D classes to be together, and move AudioStreamPlayer3D together with the 3D classes.
  • In register_server_types.cpp, organize 2D and 3D navigation code.
  • In main.cpp, organize includes and singletons.

@aaronfranke aaronfranke added this to the 4.0 milestone Oct 2, 2022
@aaronfranke aaronfranke requested a review from a team as a code owner October 2, 2022 04:55
@mhilbrunner mhilbrunner modified the milestones: 4.0, 4.x Oct 19, 2022
@mhilbrunner
Copy link
Member

PR review meeting: further internal cleanup may be nice, but not priority for now in 4.0 Beta phase.

@aaronfranke aaronfranke force-pushed the group-2d branch 2 times, most recently from f68139c to 92b149f Compare November 24, 2022 20:04
@aaronfranke aaronfranke force-pushed the group-2d branch 2 times, most recently from 06de765 to cffb88e Compare February 1, 2023 21:57
@aaronfranke aaronfranke force-pushed the group-2d branch 2 times, most recently from 86586d2 to c275453 Compare February 3, 2023 17:16
@aaronfranke aaronfranke mentioned this pull request May 6, 2023
Draft
@aaronfranke aaronfranke mentioned this pull request May 24, 2023
Open
@aaronfranke aaronfranke mentioned this pull request Jul 8, 2023
Merged
@aaronfranke aaronfranke marked this pull request as draft August 13, 2023 08:44
@aaronfranke aaronfranke marked this pull request as ready for review March 12, 2024 04:07
@aaronfranke aaronfranke force-pushed the group-2d branch 2 times, most recently from 1239af8 to 4a0ef1b Compare March 13, 2024 19:34
@aaronfranke aaronfranke force-pushed the group-2d branch 2 times, most recently from 0d18684 to 795d7b0 Compare March 27, 2024 03:07
akien-mga
akien-mga approved these changes Apr 13, 2024
View reviewed changes
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine overall.

editor/plugins/canvas_item_editor_plugin.cpp Outdated Show resolved Hide resolved
AThousandShips
AThousandShips approved these changes Apr 13, 2024
View reviewed changes
Copy link
Member

@AThousandShips AThousandShips left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@akien-mga akien-mga modified the milestones: 4.x, 4.3 Apr 13, 2024
@akien-mga akien-mga merged commit 73f5eeb into godotengine:master Apr 13, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@aaronfranke aaronfranke deleted the group-2d branch April 13, 2024 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akien-mga akien-mga akien-mga approved these changes

@AThousandShips AThousandShips AThousandShips approved these changes

Assignees
No one assigned
Labels
enhancement topic:codestyle topic:2d
Projects
None yet
Milestone
4.3
Development

Successfully merging this pull request may close these issues.
4 participants
@aaronfranke @mhilbrunner @akien-mga @AThousandShips